Make sure we use FORTIFY_SOURCE=3 as defined in the dpkg script.

Last-Update: 2023-12-27

This fixes FTBFS

Gbp-Pq: Name fortify-source-3.patch

diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
index 7336bb93bdbb18d24bbd0ab26ac9900052ec714f..3f9bdb50e59c48f04750e3f1ef4118a5a32ac9b0 100644 (file)
--- a/cmake/compilers/Clang.cmake
+++ b/cmake/compilers/Clang.cmake
@@ -105,7 +105,7 @@ endif()
 set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
 
 if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
-  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
+  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=3>)
 endif ()
 
 if (MINGW)

diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
index 719d736dfd1c536065c2e62bcc47ee95fadcbb06..79bae4389acfb51f003831daba85c0c97198984d 100644 (file)
--- a/cmake/compilers/GNU.cmake
+++ b/cmake/compilers/GNU.cmake
@@ -118,7 +118,7 @@ if (NOT APPLE AND NOT MINGW)
     set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack)
 endif()
 if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
-  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2> )
+  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=3> )
 endif ()
 
 if (TBB_FILE_TRIM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8 AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel")

diff --git a/cmake/compilers/Intel.cmake b/cmake/compilers/Intel.cmake
index 531e078ec09aad80c090c9289b8263baa07f0160..a1bf702e415bbe61311a6af32718bbbbea188510 100644 (file)
--- a/cmake/compilers/Intel.cmake
+++ b/cmake/compilers/Intel.cmake
@@ -23,7 +23,7 @@ elseif (APPLE)
     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fstack-protector -Wformat -Wformat-security
                                  $<$<NOT:$<CONFIG:Debug>>:-fno-omit-frame-pointer -qno-opt-report-embed>)
     if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")
-        set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
+        set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=3>)
     endif ()
 
     set(TBB_OPENMP_FLAG -qopenmp)

diff --git a/thread_composability_manager/cmake/compilers/Clang.cmake b/thread_composability_manager/cmake/compilers/Clang.cmake
index b1f7aeaf661cdb34253c9617a02bfb91bc44b1a7..339bbb7bc7672963605daf63f455a102146dab86 100644 (file)
--- a/thread_composability_manager/cmake/compilers/Clang.cmake
+++ b/thread_composability_manager/cmake/compilers/Clang.cmake
@@ -14,7 +14,7 @@ set(TCM_TEST_WARNING_FLAGS
     -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor -Wno-error=deprecated-declarations)
 
 set(TCM_COMPILE_DEFINITIONS "")
-set(TCM_COMMON_COMPILE_FLAGS ${TCM_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>
+set(TCM_COMMON_COMPILE_FLAGS ${TCM_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=3>
     -Wformat -Wformat-security -Werror=format-security -fPIC -fstack-protector-strong)
 
 set(TCM_LIB_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto> -fstack-clash-protection -fcf-protection=full)

diff --git a/thread_composability_manager/cmake/compilers/GNU.cmake b/thread_composability_manager/cmake/compilers/GNU.cmake
index 3065c3e87dbfe595f77a6193a555b6ebeef82cff..1f6c5e213614cd1659ea16259229acf6bf29f730 100644 (file)
--- a/thread_composability_manager/cmake/compilers/GNU.cmake
+++ b/thread_composability_manager/cmake/compilers/GNU.cmake
@@ -25,7 +25,7 @@ endif()
 
 # Gnu flags to prevent compiler from optimizing out security checks
 set(TCM_COMMON_COMPILE_FLAGS ${TCM_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv
-    -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
+    -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=3>)
 
 set(TCM_LIB_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto> $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fcf-protection=full>)
 

diff --git a/thread_composability_manager/cmake/compilers/Intel.cmake b/thread_composability_manager/cmake/compilers/Intel.cmake
index 5e45e7f8d5f4c864fe9a1135fce6f031f42aac62..61f036b396428f9027d02d0d8140c8b2106095c8 100644 (file)
--- a/thread_composability_manager/cmake/compilers/Intel.cmake
+++ b/thread_composability_manager/cmake/compilers/Intel.cmake
@@ -12,6 +12,6 @@ else()
     #  from statically linked libraries
     set(TCM_LIB_LINK_FLAGS ${TCM_LIB_LINK_FLAGS} -static-intel -Wl,-z,relro,-z,now,--exclude-libs,ALL)
     set(TCM_COMMON_COMPILE_FLAGS ${TCM_COMMON_COMPILE_FLAGS} -fstack-protector -Wformat -Wformat-security
-                                 $<$<NOT:$<CONFIG:Debug>>:-qno-opt-report-embed -D_FORTIFY_SOURCE=2>)
+                                 $<$<NOT:$<CONFIG:Debug>>:-qno-opt-report-embed -D_FORTIFY_SOURCE=3>)
     set(TCM_VISIBILITY_INLINES_HIDDEN_FLAG -fvisibility-inlines-hidden)
 endif()